0

To be more clear, I was working on file abc which was in my remote repository for a long time and some other developer worked on same file made new changes and merged. I checkout to my old commit after a long time which has old version of abc file and start make changes and push it.

When I compare my changes with base file (recent version of abc) some new changes are found and that new changes are required for our project. I do not want to replace their changes But how can I merge my changes with the latest version of abc file instead of replacing.

Luuklag
  • 3,897
  • 11
  • 38
  • 57
Anonymous
  • 3
  • 4
  • You will not overwrite their changes. Git will attempt to merge your changes during a `pull`/`merge`. If it is unable to do so automatically it will result in a "merge conflict" which you'll have to manually resolve between the two versions. – Cory Kramer Apr 26 '18 at 11:52

1 Answers1

0

You just need to rebase your change.

You can try to use the Gerrit UI to perform the rebase:

1) Go to your change in the Gerrit UI 2) Click on "Rebase" button 3) Click on "Rebase" button again

If you have conflicts to be resolved you'll receive an error message and you'll need to perform the rebase manually in your local repository to resove de conflicts:

1) Update your local repository

git fetch

2) Rebase your commit (change the branch accordingly)

git rebase origin/master

3) If you find conflicts, resolve them

git mergetool

4) When you're done commit your changes

git rebase --continue

5) Push your new commit (patchset) to Gerrit

git push origin HEAD:refs/for/master
Marcelo Ávila de Oliveira
  • 19,950
  • 3
  • 39
  • 50