Databases
StackOverflow2013
Postsdbo
POMerge a branch, but dont fill gitk with noise BUT dont lie about where it came from
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POMerge a branch, but dont fill gitk with noise BUT dont lie about where it came from
    text
    copied!<p>Im' probably doing this wrong or misunderstanding something here but basically I do not want to fill our master branch with noise but i do not want to lie about my history. </p> <p>So we have a master branch and a dev branch</p> <p>In this case we also have a feature branch full of both important and seemingly unimportant (commiting for the day etc) </p> <p>I merged feature branch onto the dev branch because i do not mind the noise on the dev branch. however now that i am merging dev branch onto master, i would rather not have all that noise from my feature branch.</p> <p>I thought merge --squash dev_branch was the answer but that seems to act as if i had a sudden flash of brilliance and did all that work in one night with absolutely no reference to the fact it was a merge and in gitk there is no mention of the feature branch at all.</p> <p>I want to bring in the change so that in gitk all you would see is "merged feature" or "merged dev_branch" but without all the noise underneath</p> <p>I could use git rebase on the dev_branch to clean up the commits made from feature branch, this way i could still keep the changes as they were in feature without any lies and prettify it in dev_branch...but this seems wrong too</p> <p>So far the best solution i have come up with is to do git merge --squash dev_branch</p> <p>and just make the comment "Look at feature branch for more detailed history" </p> <p>Am i going about this the wrong way? should i really be worried about "noise" can you just collapse changes made under a certain branch?</p> <p>So its not quite <a href="https://stackoverflow.com/questions/3697178/git-merge-all-changes-from-another-branch-as-a-single-commit">Git: merge all changes from another branch as a single commit</a></p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload