We currently have the following problem:
github: repo where development occurs by company B, only company B has the
rights to push to this repository, only they are allowed to do releases
local stash instance: clone of github repository where everyone from our
company pushes into, we need to do releases very often
The problem now is that there happened many commits in the stash repository
where the commit message should be kept internal. There are also many maven
releases which would increase the maven version very much when pushed to
We now need a way to merge our changes to upstream (github) and pull their
changes to our clone.
My ideas for pushing:
* git checkout -b github-merge
* git rebase -i $commit_where_repositories_diverged^
--> remove all commits which shouldn't be upstreamed, edit commit messages
* push to github fork -> send pull request
Problem is that in old revisions there were mixed line endings... and
therefore rebase fails..
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.