<div dir="ltr">Hello, <div><br></div><div>recently I did this command in my branch krita-gmic-ltvrdy:</div><div><br></div><div>git pull --rebase origin master </div><div><br></div><div>It merged somehow master into my branch and rebased all </div>
<div>commits of branch on top, then when I pushed some new commits,</div><div>it also managed to push some commits again (rebased ones)</div><div><br></div><div>I had to merge, weird commit that followed </div><div><a href="http://quickgit.kde.org/?p=calligra.git&a=commit&h=cb53a2c814b83e55d30bb2963596ff9be7ad8adb">http://quickgit.kde.org/?p=calligra.git&a=commit&h=cb53a2c814b83e55d30bb2963596ff9be7ad8adb</a><br>
</div><div><br></div><div>Now I don't know how to merge the branch correctly. Command:</div><div><br></div><div>git merge krita-gmic-ltvrdy<br></div><div><br></div><div>replays all the commits from branch on top again...I just wanted to have merging commit.</div>
<div>I think it is not ok, the rebase step was huge mistake of mine :-/</div><div><br></div><div>Can you suggest correct way to merge feature branch in this case?</div><div>Should I squash the commit like this <a href="http://stackoverflow.com/a/5309051/1068199">http://stackoverflow.com/a/5309051/1068199</a>?</div>
<div><br></div><div>Cheers</div><div>Lukas Tvrdy</div></div>