Add contributing guide for syncing and backporting#649
Conversation
fd5c6ef to
feae989
Compare
1601bca to
8286718
Compare
8286718 to
5549516
Compare
tylerjw
left a comment
There was a problem hiding this comment.
@ParthasarathyBana and I read through this and it looks good. @Abishalini can you also look through this and verify it makes sense?
Abishalini
left a comment
There was a problem hiding this comment.
I just followed all the steps and it looks good to me.
| ``` | ||
| git log --oneline moveit1/master $(LAST_SYNC_COMMIT)..HEAD | ||
| ``` | ||
|
|
There was a problem hiding this comment.
Another way to visualize all commits that have not been synced
| git config --global alias.hist "log --pretty=format:'%C(yellow)[%ad]%C(reset) %C(green)[%h]%C(reset) | %C(red)%s %C(bold red){{%an}}%C(reset) %C(blue)%d%C(reset)' --graph --date=short" | |
| git hist main..moveit1/master |
There was a problem hiding this comment.
I agree that aliases like this can make git outputs prettier or even more useful. To me, it would be a little out of scope to add this here or even a bit distracting. Much better would be a reference like: "Hint: you can also use the git hist alias instead of "git log" for some nicer output" along with a link to a source or another "Git Best Practices" section.
I'll leave this change out for now, but feel free to contribute something like this.
There was a problem hiding this comment.
It's actually a real improvement in terms of readability. 👍
We don't have a better place to put it, so sprinkling neat tool improvements in such instructions is still nice.
|
|
||
| ``` | ||
| git fetch origin | ||
| git checkout -b pr-sync origin/main |
There was a problem hiding this comment.
Does not justify an update, but in case you didn't know it already:
git switch -c pr-sync origin/main
|
Altogether: wow. I guess you've been through hell a number of times following this procedure until now. 🏅 |
Description
Detailed instructions on how to perform a branch sync (MoveIt 1 -> MoveIt 2) and how to backport changes (link to index.markdown). Fixes moveit/moveit2#45.
Checklist
build_locally.shscript