Hi guys. How do you resolve conflict when you rebase/merge from master in your bug/bp branch?
miarmak
CharlesW: hello!
CharlesW
Hi miaemak
miarmak
CharlesW: actually, we create our branch from master, work there, commit and after that doing 'git rebase master' (master should be updated). If it is no conflicts, git rebase it itself. And if it is conflict - manually, with help of some resolve conflict tool (I am using PyCharm for this, someone VIM +plugins)
dukhlov__
CharlesW: I use meld which is default merge tool in ubuntu
I tried git fetch --all; git pull --rebase origin master(not sure about this, also tried git rebase gerrit/origin); git mergetool; git rebase --continue. Does that look like the right steps?
miarmak
CharlesW: I can share you my workflow. Usually I have 2 local branches: master and my-feature-branch (created from actual master). So, I make a feature, make a commit. after that, switch master (git checkout master) and update it (git remote update; git pull origin master). After this switch back to my branch (git checkout my-feature-branch). And in the end, I do 'git rebase master'. if it is conflict - I go to PyCharm, resolve conflicts there and back
to CLI. there it is 'git rebase --continue'. Sometimes, it is needed to do smth like git add/rm <file>