What does Git do to prevent merge conflicts? Resolve these conflicts in the same way - create a merge commit on your local branch reconciling the changes and complete the merge.
The most common merge conflict situation is when you pull updates from a remote branch to your local branch, for example from origin/bugfix into your local bugfix branch. That reconciles the conflicting changes between the two branches.
Resolve this conflict with a merge commit on the main branch In the main branch, the bugfix branch, or some combination of the two. If you try to merge the bugfix branch into main, Git can't determine which changes to use in the merged version. Both the main and bugfix branch make updates to the same lines of source code. Little progress has been made to regulate the trade of conflict gold from Eastern Congo.The following image shows a very basic example of how changes conflict in Git. Mine operators and miners families are being forced to flee their villages due to the high threat of attack from rebel groups. The mineral-rich territories in the North Kivu province are host to killings by Congolese rebel groups against the mining settlers the M23 claims to fight for. According to a UN Group of Experts for Congo, two shipments of conflict gold were smuggled into Uganda in December 2012, which had the combined value of $19 million. The M23 allegedly uses posts at the Ugandan border to smuggle illegal gold and minerals into Kampala. M23 Congolese rebels use the revenue from gold titanium and tin mines in the North of the country to finance their operation. M23 Rebels Making Millions through Gold Smuggling from Eastern Congo (January 17, 2013) The United Nations Office for the Coordination of Humanitarian Affairs (OCHA) in Khartoum, Sudan, stated that they haven't seen sudden displacement on this scale in years. The UN has spent $2 million on this operation due to the difficulty in transporting food and medicine through desert roads and the need for high security. Following the outbreak of violence, 60,000 civilians have fled to the remote desert town of El Sireaf, already host to 2,500 previously displaced people. However, since the secession of South Sudan, tribes began mining to replace the loss of income. The tribes once relied on Sudanese government support from oil revenues. 100,000 people have already left their homes, and over 100 people have been killed in the conflict, according to the government. (amnesty international)ĭarfur Tribal Violence Flares over Gold Mines (February 4, 2013)įighting between tribes has broken out in Darfur over access to gold mines and levies on miners. Ahead of a landmark vote on a new conflict minerals law to be held in the European Parliament on, 157 civil society organisations urgently call on Members of the European Parliament to vote for a law which will finally tackle the trade in conflict minerals and ensure that European companies do not benefit from and contribute to human rights abuses. The trade in resources – such as gold, diamonds, tantalum, tin, copper and coal – continues to perpetuate a cycle of conflict and human rights abuses in many fragile areas of the world. The EU has no legislation in place to ensure companies source their minerals responsibly. No questions are asked about how they are extracted, or how it impacts on local communities. The summary of this report by Project Underground reveals Freeport McMoRan's complicity in the Suharto regime's repression of indigenous peoples.Ģ015 | 2013 | 2012 | 2011 | 2010 | 2009 | 2008 | 2007 | 2006 | 2005 | Archived ArticlesĢ015 Open Letter to Members of the European Parliament on the EU Conflict Minerals Regulation (May 19, 2015)Įvery year, millions of euro worth of minerals flow into the EU from some of the poorest places on earth. Financial Reform Bill also Targets 'Conflict Minerals' from Congo (July 21, 2010) GPF Perspectives l UN Documents | Reports | Articles The articles and analyses below follow the dark nexus between mineral riches and bloody conflict. Governments often establish repressive military regimes in mineral producing regions to protect their "national interests," but local populations rarely see the profits and are subjected to environmental damage wrought by corporations. Countries such as the Democratic Republic of Congo have fallen victim to rebels who use revenue from minerals such as diamonds, coltan and cassiterite to purchase arms and fuel conflict. Rebel groups, governments and mining companies exploit mineral resources, fueling civil and interstate conflict as players vie for control over riches. Countries rich in minerals such as cobalt, coltan, cassiterite, copper, and gold are often marred by corruption, authoritarian repression, militarization, and civil war.