23-06-16, 17:11 | #2001 |
Member
Joined: Jul 2015
Posts: 145
|
git pull --rebase
|
23-06-16, 17:17 | #2002 |
Member
Joined: Jun 2015
Posts: 138
|
Ok, that's how I do it. I have a separate local branch where all my private modifications are stored. Every time master branch changes I rebase that local branch on it. Now I can reset my local master to origin without changing the workspace. Any changes will remain unstaged and should be added explicitly. After that it can be pushed to published branch. All my local changes are still kept in the local branch in my repository.
|
23-06-16, 17:32 | #2003 |
Member
Joined: Jan 2013
Posts: 195
|
git pull --rebase or git pull origin branch_name, resolve conflicts, git add -u, git commit...
|
23-06-16, 17:58 | #2004 |
Member
Joined: Dec 2010
Posts: 2,773
|
Ok so, if anyone wants to join the OpenTomb slack team you can do so by going here. It should be possible to request access if you have a Slack account.
We currently have channels for: 1. Developers. 2. QA (Testers). 3. Public (Anyone just following the project). Feel free to join |
23-06-16, 18:27 | #2005 | |
Member
Joined: May 2010
Posts: 256
|
Quote:
If I get it correctly, I can update my working branch easily with "rebase", but what about when I have to submit a feature? I would need to strip the branch of all the unnecessary conflicts. |
|
23-06-16, 18:42 | #2006 | |
Member
Joined: Jun 2015
Posts: 138
|
Quote:
You can look at example in `git help reset` under `interrupted workflow`. Last edited by vvsgh; 23-06-16 at 19:35. |
|
23-06-16, 19:27 | #2007 |
Member
Joined: May 2010
Posts: 256
|
Welp... it's probably bad practice, but I decided to just use a symlink and have a separate folder for my personal C::B project files. XD
Now, if I ever need to submit a PR or update the source, git is gonna acknowledge the modified code but not the C::B files, so no commit is gonna overwrite the original project, yet I retain a customized workspace |
23-06-16, 19:39 | #2008 | |
Member
Joined: Jul 2015
Posts: 1
|
Quote:
It has exactly the same syntax as a standard .gitignore file. EDIT: this works for untracked files only, a sparse checkout can be used for tracked files Last edited by stltomb; 23-06-16 at 22:36. Reason: clarification |
|
23-06-16, 20:00 | #2009 |
Member
Joined: May 2010
Posts: 256
|
Oh, sweet!
|
24-06-16, 09:08 | #2010 |
Member
Joined: Jan 2013
Posts: 195
|
This time I can't push readme to github (do it later ~7 hours);
For merge requests: * Special merge request, not for merging or with delayed time for merging must contains in name `[NOT_FOR_MERGING]` prefix; that requests may be merged only after request's autor writes comment `[CAN_BE_MERGED_NOW]`; I know how to fix last physics bug (see TODO, climbing), so I will fix it today; |
Thread Tools | |
|
|