Tag: "merge"

Until recently, I relied on Araxis Merge als external diff/merge tool. Now nothing happens any more when i launch the command. When I launch it as conflict resolution tool, the window that tells me I...

• Sourcetree
• Question
• araxis
• diff
• external
• merge
• sourcetree

...b7e3798c41cc8ed49ac0a6292e7b31eaa452061 Merge: f672aba cd8e479 Author: Byron Appelt Date: Tue Sep 11 14:00:09 2012 -0500 Merge branch 'ci' of github.com:numerex/puppet into ci commit f672aba9cead45440517de8759ab284a31e103bb A...

• Bamboo
• Question
• branch
• git
• merge

Hi, We have two separate JIRA installations that we want to merge together and we're wondering what the best approach is to take. Specifically, what's the best order to do the following on the merge...

• Jira
• Question
• jira
• merge
• migration
• project

When we originally started using confluence the administrators didn't create a best practice for user names. Now we have one but hundreds of people have multiple accounts. I'm wondering how we can tr...

• Confluence
• Question
• confluence
• content
• merge
• user

Hello, has anybody running integration with Araxis Merge? I have installed command line tools, set up path but SourceTree still says "Cannot find Araxis Merge". Does anybody know what should I c...

• Sourcetree
• Question
• araxis
• integration
• merge
• sourcetree

I have a merge conflict of some binary files in SourceTree, and I want to just discard my changes and use the latest version committed to git. Normally I would do this by selecting: Resolve C...

• Sourcetree
• Question
• conflict
• git
• merge
• resolve
• sourcetree

Anyone know of an add-on that would let me branch, tag, and merge pages in Confluence? Like source control applied to confluence pages. Would be very helpful for versioning specs, where the s...

• Confluence
• Question
• confluence
• merge
• page

1. Is there a way to decrease the space between Panel Boxes which are situated nex to each other using Sections and Columns? I want them to be flush next to each other but there's a big gap between t...

• Confluence
• Question
• column
• confluence
• merge
• page
• section
• +1 more tag...

I have two different pages on Confluence. I want to be able to merge the two pages together and preserve the history of both in the merged outcome. What is the process can I follow to accomplish t...

• Confluence
• Question
• confluence
• history
• merge

I appologize if this is a duplicate question... Recently we merged with another company- we both use JIRA and Confluence. How do we go about merging the 2 JIRAs and the 2 Confluences? I found i...

• Confluence
• Question
• confluence
• jira
• merge

I can get the instances locally merged. But then how to merge a local live system with an OnDemand live system? The projects are distinct and do not overlap. From the OnDemand documentation it is n...

• Jira
• Question
• import
• jira-cloud
• merge