[TYPO3-dev] Git issues with dependencies
Kay Strobach
typo3 at kay-strobach.de
Wed May 30 12:09:18 CEST 2012
Hello Lorenz,
do you use a submodule for dam?
regards
Kay
Am 29.05.2012 17:00, schrieb Lorenz Ulrich:
> Hi everyone
>
> I'm doing DAM development with the TYPO3 Git/Gerrit infrastructure. All
> that stuff works really well but there's something that puzzles me all
> the time: All my change requests in Gerrit have a dependency to the last
> change I pushed. This is no problem as long as these issues get merged
> before, but if they get merged after or even abandoned I need to rebase
> my changes before merging even if they don't touch the same files.
>
> Maybe you could tell me what I'm doing wrong. I always stick to the same
> pattern:
>
> - "git checkout master" if I'm not on master anyway
> - "git pull" to ensure master is up-to-date.
> - "git checkout -b ISSUENUMBER" to create a dev branch for the issue I'm
> working on
> - "git commit -a" to commit
> - "git push origin HEAD:refs/for/master" to push to Gerrit
>
> As I said, it's working, but I don't see where this dependency comes from.
>
> Thanks for any help.
>
> Best regards,
>
> Lorenz
--
http://www.kay-strobach.de - Open Source Rocks
TYPO3 .... inspiring people to share!
Get involved: http://typo3.org
Answer was useful - feel free to donate:
-
https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KPM9NAV73VDF2
- https://flattr.com/profile/kaystrobach
More information about the TYPO3-dev
mailing list