Getting conflicts while fork and sync of the code base

30 views

Skip to first unread message

sivashankar ravishankar

unread,

Jun 25, 2015, 4:36:24 AM6/25/15

to concour...@googlegroups.com

Hi All,

I am trying to setup the code base in my windows 7 32 bit desktop. I followed the procedure as given in the link, https://cinchapi.atlassian.net/wiki/display/CON/Concourse+Dev+Setup.

When i did fork and sync operations i got so many conflicts. I have captured throws conflicts which i have attached. Anyone has experienced this.

Please guide me in this.

Regards,

Sivashankar

conflicts.txt

Jeff Nelson

unread,

Jun 25, 2015, 7:06:22 AM6/25/15

to concour...@googlegroups.com, hcl...@gmail.com

You should be syncing upstream/develop with your forked develop branch. Ensure that you have develop checked out locally and then the sync should go through without issues.

--
You received this message because you are subscribed to the Google Groups "Concourse Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to concourse-dev...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Jeff Nelson

Founder & CEO | Cinchapi, Inc.

je...@cinchapi.com | 267-495-7751

Start using Cinchapi for real time insight into operational data.

Reply all

Reply to author

Forward

0 new messages