![]() Oddly enough, having these restrictions will give you and your team more freedom and confidence in making decisions by removing uncertainty and improving focus. So, basically a completely manual merge that is still seen as a merge as git. Make sure you have a clear understanding with your supervisor, what your degrees of freedom are with any decisions and do the same thing with your team. Please check out the external tools section in the SmartGit preferences. With that knowledge, they feel ironically more free now that they know what out of bounds, you need to make these parameters clear for yourself and for your team, find out which decisions fall into which decision-making category from the perspective of your boss and for your team. Recently, there were problem solving to overcome a loss of income and looking for solutions, but they knew that I wouldn't allow steep discounts like buy one, get full and free. Now they know that for any decision, it must bide by a monthly budget and event budget, and some other general guidelines. This was one of the biggest challenges for my team when they got stuck. You must be clear about the range of possibilities that you or your team can genuinely consider. The second parameter you need to consider is the degrees of freedom. But with the following additions, you really need everyone's full commitment and you have a lot of time. The same things need to be in place as with majority vote. Usually as often, there are at least a few people that just agree with the majority to end the conversation. This is actually closer to majority vote. Be aware though that if there's a consistent loser, that loser may start to become disgruntled. You need a higher engagement and commitment to the results. ![]() The team has access to the information they need to make the decision. You're not tied to a specific outcome because know the teammates you, something you didn't want. This is a good option in the following scenarios, you have the time to take, to make a good decision. You need more commitment to the final say, and you need people to feel listened to understand, though, if you don't take the advice, you need to engage them and let them know why. In the following cases, you realize that others may have valuable input or expertise. This is when you, as the leader get input, but ultimately make the final decision. Second is decision-making by the leader with input call participatory decision-making. You have an inexperienced team, there's a crisis, or if there are legal, ethical, or other high impact ramifications, if the wrong choice is taken. If any of the following features may apply, time is short. The first is decision by the leader called autocratic. This can be broken up into four general types. The first parameter is who was making the decisions. Thankfully, one member of the team brought it to my attention and we were able to solve the problem before it ended up in ruin, but it made me start paying closer attention to problem solving you and your team should always know the parameters of decision-making. I assume that they knew, but the reality was that they ended up stagnating and froze. To: Re: 3-way Diff aka: Conflict Solver for any modified file?One of my biggest mistakes as an absentee owner was not making it clear enough to my team, what they were, and weren't allowed to make decisions on. Thus I have to manually pick and order the changes to be applied. So, basically a completely manual merge that is still seen as a merge as git auto-merging is wrong 51% of the time which means I have to review each change. Git ls-files -u | git checkout-index -stage=all -stdin ![]() Git read-tree -um $(git merge-base topic) master Git merge -no-ff -no-commit -s ours topic One way in git to maintain the correct merge-base and fork refs is: I currently do this with scripts and wrapping kdiff (and trying some others). In the case of '-theirs', I am comparing the remote, non-merged, original of the file as I am merging master changes into a downstream topic that will never get merged back to the upstream master and need to merge the local topic changes in an order that prevent regressions. I should be able to integrate my merge and diff scripts into it. Thanks, totally missed the external tools section under the preferences.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |