|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Hi Kris, Could you please let us know why the technical writers are supposed to do check-ins on a developer/feature branch? This sounds to me like a very risky situation in the first place. I am not f
Hi Kris, Could you please let us know why the technical writers are supposed to do check-ins on a developer/feature branch? This sounds to me like a very risky situation in the first place. I am not f
|
By
stinakab
· #44975
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
I really appreciate everyone's feedback and advice; it reminds me what a wonderful community we have here! Chris, thanks especially for your most recent e-mail. Yes, education about Git and Git best p
I really appreciate everyone's feedback and advice; it reminds me what a wonderful community we have here! Chris, thanks especially for your most recent e-mail. Yes, education about Git and Git best p
|
By
Kristen James Eberlein
· #44984
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
This might be slightly off-topic, but certainly Git is version control for many companies' DITA implementations. Short version: What tactic have you found best to minimize merge conflicts for new tech
This might be slightly off-topic, but certainly Git is version control for many companies' DITA implementations. Short version: What tactic have you found best to minimize merge conflicts for new tech
|
By
Kristen James Eberlein
· #44972
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
One thing I didn't address is merging a SUBSET of your feature branch into develop... Wow... That never even occurred to me. I guess I would handle that by controlling my commits to my local version o
One thing I didn't address is merging a SUBSET of your feature branch into develop... Wow... That never even occurred to me. I guess I would handle that by controlling my commits to my local version o
|
By
despopoulos_chriss
· #44977
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Using Git requires a change in thinking. All authors need to abandon the thoughts of 'check out', 'check in', 'lock'. Those don't really apply to git. New concepts that are absolutely essential to lea
Using Git requires a change in thinking. All authors need to abandon the thoughts of 'check out', 'check in', 'lock'. Those don't really apply to git. New concepts that are absolutely essential to lea
|
By
Alastair Dent
· #44978
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
For an Oxygen-using client that uses git on the back end I implemented a custom set of actions using the Oxygen git plugin as my code base that automates all the git actions for users, including creat
For an Oxygen-using client that uses git on the back end I implemented a custom set of actions using the Oxygen git plugin as my code base that automates all the git actions for users, including creat
|
By
ekimber@contrext.com
· #44981
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Yikes... What a PM nightmare. Why is PM always so difficult to work with? What you're trying to do is apply a tool that counts on technical discipline to a workflow that counts on social lack of disci
Yikes... What a PM nightmare. Why is PM always so difficult to work with? What you're trying to do is apply a tool that counts on technical discipline to a workflow that counts on social lack of disci
|
By
despopoulos_chriss
· #44985
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Thank you, Chris, Alastair, and Jean-Noël for your feedback. I do want to set some additional context here: I am familiar with and comfortable with Git, although it is new to the technical writers on
Thank you, Chris, Alastair, and Jean-Noël for your feedback. I do want to set some additional context here: I am familiar with and comfortable with Git, although it is new to the technical writers on
|
By
Kristen James Eberlein
· #44980
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
We need a bit more information on the workflow here. If changes happen only in a directory dedicated to documentation where only writers add content, that means that the changes introduced over time a
We need a bit more information on the workflow here. If changes happen only in a directory dedicated to documentation where only writers add content, that means that the changes introduced over time a
|
By
Jean-Noël AVILA
· #44979
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Regarding this: And how to best plan a process for the scenario in which a writer wants to merge some (but not all content) from a feature branch into the development branch? In the absence of granula
Regarding this: And how to best plan a process for the scenario in which a writer wants to merge some (but not all content) from a feature branch into the development branch? In the absence of granula
|
By
despopoulos_chriss
· #44983
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Christina, even if you have a separate repository for your documentation source, GIT divides it into a main branch, a develop branch, and then practice is to use various feature branches for your pers
Christina, even if you have a separate repository for your documentation source, GIT divides it into a main branch, a develop branch, and then practice is to use various feature branches for your pers
|
By
despopoulos_chriss
· #44976
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
We use GIT in a team of tech writers. We do a few things... Division of Labor: Different members own different parts of the doc set. This minimizes cross-talk. But note, it does not ELIMINATE it. Comm
We use GIT in a team of tech writers. We do a few things... Division of Labor: Different members own different parts of the doc set. This minimizes cross-talk. But note, it does not ELIMINATE it. Comm
|
By
despopoulos_chriss
· #44973
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
I would avoid stashing in this case. Push commits for individual file. Get those merged when approved. The mindset needs to change to think in small units. Many software teams work in a DEV/Master (or
I would avoid stashing in this case. Push commits for individual file. Get those merged when approved. The mindset needs to change to think in small units. Many software teams work in a DEV/Master (or
|
By
Alastair Dent
· #44987
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
You've nicely summed up the fundamental problem: "What you're trying to do is apply a tool that counts on technical discipline to a workflow that counts on social lack of discipline." More background:
You've nicely summed up the fundamental problem: "What you're trying to do is apply a tool that counts on technical discipline to a workflow that counts on social lack of discipline." More background:
|
By
Kristen James Eberlein
· #44988
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
Kris, The long-running feature branches are indeed the challenge in this scenario, but this is a common issue for which Git provides multiple solutions. As others have suggested, one way to minimize m
Kris, The long-running feature branches are indeed the challenge in this scenario, but this is a common issue for which Git provides multiple solutions. As others have suggested, one way to minimize m
|
By
Roger Sheen
· #44989
·
|
|
DITA and Git: Minimizing merge conflicts
#version-control
#change-management
What you are pointing out is basically rewriting the history of feature branches, which is totally against Git's way of doing in its standard usage. In this case, there's need for more advanced git ma
What you are pointing out is basically rewriting the history of feature branches, which is totally against Git's way of doing in its standard usage. In this case, there's need for more advanced git ma
|
By
Jean-Noël AVILA
· #44993
·
|