git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Opinions on my GIT model

From
Jjulia <deborave@gmail.com>
Date
Jan 19, 2011, 19:33 UTC
Message-ID
<1295465635148-5941048.post@n2.nabble.com>
Hi All,
Working on a GIT model for my projects.
1.  Three main repositories, bare public repo, maintainer repo, developer
repo
2.  Developer1 clones the public repo and makes feature1 branch, updates,
commits changes and pulls/pushes.
3.  Developer2 on their local repo does the same thing and pushes updates.
4.  Maintainer get the green light to rebase feature1 branch with master -
they pull the whole repo, rebase the feature1 branch with master and then
push feature1.
5.  Developer1 pulls feature1 brach again and continues to work, does a
pull/push to feature1 on public repo.

Now, main question is - given that in step 4 maintainer rebase the feature branch with master then pushed, he is committing a cardinal sin by rebasing a branch that has already been pushed to the public repo, so if anyone has made any changes based on the commits originally pushed that now have been rebased - developer who tries to push those changes will have issues.

Will these be solved by executing of a pull? 

Sorry if these are trivial questions...still trying to wrap my head around GIT.

Thank you for your help.
Cheers,
Julia
-- 
View this message in context: http://git.661346.n2.nabble.com/Opinions-on-my-GIT-model-tp5941048p5941048.html
Sent from the git mailing list archive at Nabble.com.
Next: Ramkumar Ramachandra
Message 1 of 2 in “Opinions on my GIT model”
  1. juliaJan 19, 2011
  2. Ramkumar RamachandraJan 20, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.