java - How do I break down a large merge with conflicts into more manageable chunks? -


I maintain a large GIT repository with 50,000 files in it. The main line development branch is called "development". I have a branch called "feature" which is working almost independently for about 5 months, due to the complexity of work it is not possible to merge with "development", but Now it is close to completion, it wants to re-sync with "development".

Usually this means that "in the original / evolved" feature "fix", fix conflict, test, commit, and push but there is a large number of disputes in this merge point. That ~ 4000 changes in mergers and ~ 450 unused changes Some of these conflicts are quite trivial (eg, giltinger files and so forth) but many concrete rewrites and difficult to solve

In addition, these conflicts have been crossed over different software domains. Developers of each domain must resolve the conflicts in their own areas. It will take several days for at least a concerted effort to remove and commit the struggle.

Is there any way to break it down so that the owners of the domain can merge their disputes in parallel, point? Is there something in the form of a partial committed merger where I share the merged content and I am not in the balance?

My main idea is that "feature" can merge with some intermediate tags within "development", e.g. We have the release tags of "A", "B", "C", "D" in the last 5 months. So if they merge "a" and then "b" and so on, then each merger will become less complicated, although there may be more conflicts at all.

Any other things that I can try?

Your idea of ​​merging intermediate tags is probably the best you can get. Or more), but for the most part they should be small, and therefore it is easy to merges.

However ... If the problem is that you have to re-write heavy opposition due to bulk, there is a little chance of an easy conflict solution. Even if merged at a time (e.g., git imerge approach) can not handle heavy rewrites.

Comments

Post a Comment

Popular posts from this blog

c - Mpirun hangs when mpi send and recieve is put in a loop -

I was trying to use the program to use mifrewan on 4 node clusters. Distributing node 0 data in nodes 1, 2 and 3. In the program, from '90 'to variable values ​​of' dior 'to be calculated. Therefore the node is distributing data and collecting results in an omitted fashion (for different values ​​of var 'dir') when do {*******} Whereas (dir Loop is given, Mippun is hanging, and no output is found. But when I comment on two {*******} (dir The loop output is obtained for the initial value of variable dir dir = -90 ), and that output is correct. The problem occurs when the loop is given. Can anyone help me in solving this problem. #include "mpi.h" int main (int argc, char * argv []) Float dir = -90; Int rank, nanoprakash; MPI_Status status; MPI_Init (& amp; argc, & argv); MPI_Comm_rank (MPI_COMM_WORLD, & amp; Rank); MPI_Comm_size (MPI_COMM_WORLD, & amp; numprocs); If (rank == 0) {/ / data to begin / / (dest = 1; dest ...
Read more

python - Apply coupon to a customer's subscription based on non-stripe related actions on the site -

I can not find anything in the source about using coupons after subscribing to a user's plan. Is it possible to use a coupon to credit a user's membership after initial subscription? If not, what is the best option? Specifically, I want to give a user 100% coupon for that month, when they take 5 [site specific actions]. This is possible, but may not be the best idea. Coupons are currently applied to the stripe, then apply again at the customer level and each client can have a single coupon. So if you are already offering discounts to the coupon, then the customer who is currently in the present will also give up. It also means that if you are using a recently-added multiple subscription capacity, then all of the user's subscription will be ready for the month. Coupons can be set to "Once", only once (as the only name) can be used by any customer, so if this credit can earn more than once, You will have to maintain a 100% discount coupon continuousl...
Read more

java - Unable to get JDBC connection in Spring application to MySQL -

मैंने स्प्रिंग में डीबी कॉन्फ़िगरेशन का पालन किया है: & lt; bean id = "dataSource" Class = "org.apache.commons.dbcp.BasicDataSource" नष्ट-विधि = "बंद" & gt; & Lt; प्रॉपर्टी नाम = "url" मान = "jdbc: dburl" / & gt; & Lt; संपत्ति नाम = "driverClassName" मान = "com.mysql.jdbc.Driver" / & gt; & Lt; संपत्ति नाम = "उपयोगकर्ता नाम" मान = "उपयोगकर्ता नाम" / & gt; & Lt; संपत्ति नाम = "पासवर्ड" मान = "पासवॉर्फ" / & gt; & Lt; प्रॉपर्टी नाम = "हटाए गए हटाए गए" मान = "सही" / & gt; & Lt; गुण नाम = "प्रारंभिक आकार" मान = "3" / & gt; & Lt; संपत्ति नाम = "अधिकतमअक्टिव" मान = "5" / & gt; & Lt; / सेम ​​& gt; डीबी से गुण मूल्यों को लोड करने के लिए अतिरिक्त कॉन्फ़िगरेशन। & lt; bean id = "config1" class = "org.apache.commons.configuration....
Read more