Daily team workflow
This is the normal rhythm when working with a team:First time joining a project
When you’re new to a project:Handling merge conflicts
Sometimes your changes and the team’s changes clash. Here’s what to do:When it happens
You runag fetch and see:
Step-by-step resolution
1
Open the listed files in your editor
2
Look for conflict markers
<<<<<<< HEAD= your changes======== divider between versions>>>>>>>= their changes
3
Edit the file to keep what you want
You can:
- Keep your version (delete the markers and their version)
- Keep their version (delete the markers and your version)
- Mix both versions together manually
4
Remove all the conflict markers (<<<<<<<, =======, >>>>>>>)
5
Save the file in your editor
6
Tell Anchor4Git you're done
7
Share your resolution
Example: Resolving a conflict
Before (conflicted file):Going back to an old version
Look at an old version (temporary)
Roll back to an old version (permanent)
Stay on an old version
To find the save ID, run ag info
Setting up a shared project from scratch
If you’re the team lead starting a new project:You’ll need to set up authentication (like a personal access token) for GitHub/GitLab. Check their documentation for help.
Anchor4Git automatically handles login to major providers like GitHub using a UI.